mention-maximized-in-emacs-manpage.diff

* The emacs manpage now mentions the "maximized" value for fullscreen.
  Patch: mention-maximized-in-emacs-manpage.diff
  Provided-by: Sven Joachim <svenjoac@gmx.de>
  Date: Wed, 25 Aug 2010 17:54:33 +0200
  Added-by: Rob Browning <rlb@defaultvalue.org>
  Status: incorporated upstream

  The Debian patch is taken from this upstream commit:

  revno: 100003
  committer: Chong Yidong <cyd@stupidchicken.com>
  branch nick: emacs-23
  timestamp: Thu 2010-08-26 11:14:55 -0400
  message:
    * emacs.1: Mention "maximized" value for the "fullscreen" X resource.

diff --git a/doc/man/ChangeLog b/doc/man/ChangeLog
index 290482b6cdccd0b1b60742ca87ac868b55a156d3..3bee2a1011ab5cec78c113e705e80770f672d0b1 100644 (file)
--- a/doc/man/ChangeLog
+++ b/doc/man/ChangeLog
@@ -1,3 +1,7 @@
+2010-08-26  Sven Joachim  <svenjoac@gmx.de>
+
+       * emacs.1: Mention "maximized" value for the "fullscreen" X resource.
+
 2010-05-07  Chong Yidong  <cyd@stupidchicken.com>
 
        * Version 23.2 released.

diff --git a/doc/man/emacs.1 b/doc/man/emacs.1
index a42c07ec330c923a5c707852c3da4dd09d38c93d..48ffdeedd9d13e86d2cb4633e26c4ded9f19a502 100644 (file)
--- a/doc/man/emacs.1
+++ b/doc/man/emacs.1
@@ -403,11 +403,12 @@ sets the window's text color.
 The desired fullscreen size.
 The value can be one of
 .IR fullboth ,
+.IR maximized ,
 .IR fullwidth ,
 or
 .IR fullheight ,
-which correspond to the command-line options `\-fs', `\-fw', and
-`\-fh', respectively.
+which correspond to the command-line options `\-fs', `-mm', `\-fw',
+and `\-fh', respectively.
 Note that this applies to the initial frame only.
 .TP
 .BR geometry " (class " Geometry )